From: Marek Lindner <lindner_marek@yahoo.de>
Date: Mon, 18 May 2009 17:49:15 +0000 (+0000)
Subject: [batman] bump revision / handle multiple HNA / deal with DEVELOPER=1 properly
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=72482978145ba9cc52e90c7cb9a7f3607a74af4d;p=feed%2Frouting.git

[batman] bump revision / handle multiple HNA / deal with DEVELOPER=1 properly


git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/batman@15917 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/Makefile b/Makefile
index 549952f..052039b 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=batmand
-PKG_REV:=1249
+PKG_REV:=1267
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\"
@@ -105,15 +105,15 @@ MAKE_BATGAT_ARGS += \
 define Build/Configure
 endef
 
-ifneq ($(DEVEL_CONFIG)$(CONFIG_PACKAGE_batmand),)
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
 	BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS)
 endif
 
-ifneq ($(CONFIG_DEVEL)$(CONFIG_PACKAGE_vis),)
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_vis),)
 	BUILD_VIS := $(MAKE) -C $(PKG_BUILD_DIR)/vis $(MAKE_VIS_ARGS)
 endif
 	
-ifneq ($(CONFIG_DEVEL)$(CONFIG_PACKAGE_kmod-batgat),)
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
 	BUILD_BATGAT := $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATGAT_ARGS)
 endif
 	        
diff --git a/files/etc/config/batmand b/files/etc/config/batmand
index a67fa5d..6d1f3be 100644
--- a/files/etc/config/batmand
+++ b/files/etc/config/batmand
@@ -1,6 +1,6 @@
 config batmand general
 	option interface		ath0
-	option announce			
+	option hna			
 	option gateway_class		
 	option originator_interval
 	option preferred_gateway	
diff --git a/files/etc/init.d/batmand b/files/etc/init.d/batmand
index 5da2062..411f025 100644
--- a/files/etc/init.d/batmand
+++ b/files/etc/init.d/batmand
@@ -8,7 +8,7 @@ start () {
 		echo $1 Error, you must specify at least a network interface
 		exit
 	fi
-	announce=$(uci get batmand.general.announce)
+	hnas=$(uci get batmand.general.hna)
 	gateway_class=$(uci get batmand.general.gateway_class)
 	originator_interval=$(uci get batmand.general.originator_interval)
 	preferred_gateway=$(uci get batmand.general.preferred_gateway)
@@ -19,9 +19,10 @@ start () {
 	disable_aggregation=$(uci get batmand.general.disable_aggregation)
 	batman_args=""
 
-	if [ $announce ]; then
-		batman_args=${batman_args}'-a '$announce' '
-	fi
+	for hna in $hnas
+	   do
+	      batman_args=${batman_args}'-a '$hna' '
+	   done
 
 	if [ $gateway_class ]; then
 		batman_args=${batman_args}'-g '$gateway_class' '